From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 1 Aug 2011 22:29:28 +0000 (+0200)
Subject: shell-app-system: Load settings apps
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8003
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=004c5cf287b6d0766886d283c4ac9c60d1bc5b2b;p=gnome-shell.git

shell-app-system: Load settings apps

When porting to the new gnome-menus API in commit 8f3bdd4f1, the
initial loading of settings apps was left out, so settings panels
are neither found nor can be launched from the top panel menus.
---

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 80eada415..48b0ddfff 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -347,6 +347,11 @@ reread_menus (ShellAppSystem *self)
           g_warning ("Failed to load apps: %s", error->message);
           return;
         }
+      if (!gmenu_tree_load_sync (self->priv->settings_tree, &error))
+        {
+          g_warning ("Failed to load settings: %s", error->message);
+          return;
+        }
       self->priv->loaded = TRUE;
     }